Add 0016-Use-CRT_DIR-to-find-crt-.o-on-ppc64.patch.

Thanks to Hiroyuki Yamamoto <yama1066@gmail.com> for the report and
the patch.

Closes: #646609

diff --cc debian/.git-dpm
index c8171fa2e2a601be981e9b08e9a871c0370ac92a,0000000000000000000000000000000000000000..3e65993e29a00fdcb9fcba427999d68b5e62b96c
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- a81a47f989199e0705fdd7b2142dee04f497f721
- a81a47f989199e0705fdd7b2142dee04f497f721
 +# see git-dpm(1) from git-dpm package
++f6ec40aeab76b44285f6348e748e9c4f44474d19
++f6ec40aeab76b44285f6348e748e9c4f44474d19
 +7aee3de6fd6bca44751754b10a338947fa947b1c
 +7aee3de6fd6bca44751754b10a338947fa947b1c
 +emacs23_23.3+1.orig.tar.bz2
 +80b3822579eddfc120641c5a181eb0b5c7a0667d
 +23065394

diff --cc debian/patches/0016-Use-CRT_DIR-to-find-crt-.o-on-ppc64.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..5348526fd44f2847057588ac770a5e27d9097e5d
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0016-Use-CRT_DIR-to-find-crt-.o-on-ppc64.patch
@@@ -1,0 -1,0 +1,64 @@@
++From f6ec40aeab76b44285f6348e748e9c4f44474d19 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Tue, 25 Oct 2011 19:52:51 -0500
++Subject: Use CRT_DIR to find crt*.o on ppc64.
++
++The Emacs build should now look for crt*.o in the correct multiarch
++location during ppc64 builds.
++
++Provided-by: Hiroyuki Yamamoto <yama1066@gmail.com>
++Date: Wed, 26 Oct 2011 01:39:35 +0900
++Applied-by: Rob Browning <rlb@defaultvalue.org>
++Bug-Debian: http://bugs.debian.org/646609
++---
++ configure.in   |    8 ++++----
++ src/m/macppc.h |    4 ++--
++ 2 files changed, 6 insertions(+), 6 deletions(-)
++
++diff --git a/configure.in b/configure.in
++index 94efa35..f544aca 100644
++--- a/configure.in
+++++ b/configure.in
++@@ -172,7 +172,7 @@ fi
++ CRT_DIR=
++ AC_ARG_WITH([crt-dir],dnl
++ [AS_HELP_STRING([--with-crt-dir=DIR],[directory containing crtn.o etc.
++-This option is only used on x86-64 and s390x GNU/Linux architectures.])])
+++This option is only used on x86-64, powerpc64 and s390x GNU/Linux architectures.])])
++ CRT_DIR="${with_crt_dir}"
++ 
++ AC_ARG_WITH([gnustep-conf],dnl
++@@ -1006,11 +1006,11 @@ AC_CONFIG_LIBOBJ_DIR(src)
++ dnl Do this early because it can frob feature test macros for Unix-98 &c.
++ AC_SYS_LARGEFILE
++ 
++-## Note: at present CRT_DIR is only used for amdx86-64 and ibms390x.
+++## Note: at present CRT_DIR is only used for amdx86-64, powerpc64 and ibms390x.
++ ## Other machine types hard-code the location in src/[ms]/*.h.
++ case "${canonical}" in
++-  x86_64-*-linux-gnu* | s390x-*-linux-gnu* )
++-   ## On x86-64 and s390x GNU/Linux distributions, the standard library
+++  x86_64-*-linux-gnu* | powerpc64-*-linux-gnu* | s390x-*-linux-gnu* )
+++   ## On x86-64, powerpc64 and s390x GNU/Linux distributions, the standard library
++    ## can be in a variety of places.  We only try /usr/lib64 and /usr/lib.
++    ## For anything else (eg /usr/lib32), it is up the user to specify
++    ## the location (bug#5655).
++diff --git a/src/m/macppc.h b/src/m/macppc.h
++index c0fcae2..78ca68e 100644
++--- a/src/m/macppc.h
+++++ b/src/m/macppc.h
++@@ -50,9 +50,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
++ #define LD_SWITCH_MACHINE_TEMACS -Xlinker -znocombreloc
++ #ifdef _ARCH_PPC64
++ #undef START_FILES
++-#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
+++#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o
++ #undef LIB_STANDARD
++-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
+++#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o
++ #endif
++ #endif
++ 
++-- 
++1.7.6.3
++

diff --cc debian/patches/series
index b089e65379256faa7174907a43cee766e4a502e8,0000000000000000000000000000000000000000..63fef97a431dfcf40e52dcc5c763992b9ddc90f2
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,15 -1,0 +1,16 @@@
 +0001-Prefer-usr-share-info-emacs-23-over-usr-share-info.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Cause-the-build-to-fail-if-liblockfile-isn-t-selecte.patch
 +0006-Avoid-silently-losing-mail-via-fakemail.patch
 +0007-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0008-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch
 +0009-Invoke-the-correct-xmlstarlet-executable-on-Debian-s.patch
 +0010-Fix-startup-hang-on-Debian-GNU-kFreeBSD.patch
 +0011-Don-t-clear-FONTCONFIG_LIBS-and-FONTCONFIG_CFLAGS-in.patch
 +0012-Fix-a-tty-related-preprocessor-inclusion-error-affec.patch
 +0013-Expect-0-from-kill-for-zombies-on-GNU-Hurd.patch
 +0014-Add-i386-to-cpp_undefs-in-configure.in-to-fix-i386-m.patch
 +0015-Look-for-crt1.o-in-the-correct-multiarch-location.patch
++0016-Use-CRT_DIR-to-find-crt-.o-on-ppc64.patch